From: Kim F. Storm <storm@cua.dk>
Date: Sat, 24 Feb 2007 21:52:24 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~30183
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b0943f48d9c5510f1035f2aac7994a069b307195;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a40ee053bcf..05edb5c711e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-24  Kim F. Storm  <storm@cua.dk>
+
+	* emulation/cua-base.el (cua-paste): Handle x-clipboard-yank.
+	(cua--init-keymaps): Remap x-clipboard-yank to cua-paste.
+
 2007-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* startup.el (command-line): Also check if the abbrev file is